From ab5c8fb129d5477e0d6414b75d5304f72d3a2f92 Mon Sep 17 00:00:00 2001
From: Tim Young <Tim.Young@LightSys.org>
Date: Sat, 8 Aug 2015 13:00:05 -0600
Subject: [PATCH] More puzzle context help

---
 EduNetworkBuilder/Resources/Help.rtf          |  4 +-
 .../Resources/Level2_Bad_Encryption.enbx      | 52 +++++++++++++-
 .../Resources/Level2_Bad_Route.enbx           | 52 +++++++++++++-
 .../Resources/Level2_Blast_From_Past.enbx     | 55 ++++++++++++--
 .../Resources/Level2_Build_A_VPN.enbx         | 50 ++++++++++++-
 .../Resources/Level2_Connect_The_Dots.enbx    | 51 ++++++++++++-
 .../Resources/Level2_FirewallDemo.enbx        | 71 +++++++++++++++---
 .../Resources/Level2_VPN_Demo.enbx            | 72 ++++++++++++++++++-
 .../Resources/Level2_VPN_woes.enbx            | 44 ++----------
 9 files changed, 382 insertions(+), 69 deletions(-)

diff --git a/EduNetworkBuilder/Resources/Help.rtf b/EduNetworkBuilder/Resources/Help.rtf
index fba48c7..6e132c6 100644
--- a/EduNetworkBuilder/Resources/Help.rtf
+++ b/EduNetworkBuilder/Resources/Help.rtf
@@ -45,7 +45,7 @@ Level_4: Advanced Subnetting and Routing\par
 The Basics:\par
 \b0 There are four main components to subnetting.  The IP Address, the netmask, the default gateway, and static routes.\par
 \b The IP Address:\par
-\b0 The IP Address is a set of four numbers, connected by periods.  Each of the numbers is eight bits long, which means it is a number between 0 and 255.  On any network, each IP Address should be unique.  \par
+\b0 The IP Address is a set of four numbers, connected by periods.  Each of the numbers is eight bits long, which means it is a number between 0 and 255.  On any network, each IP Address should be unique.  The IP Addresses should also be "local" to the other IPs next to them.  The Netmask is what determines if an IP address is considered local.\par
 Most IP addresses are "public" and are reserved for specific people, places, and things.  These reservations are managed by various "registrars" on the Internet.  But there are three main sets of "internal" IP addresses that are set aside for use behind firewalls.  10.x.x.x, 192.168.x.x, and 172.16-31.x.x  We will be using these "Private" IP Addresses in this simulation.\par
 \b The Netmask:\par
 \b0 The network mask (or netmask) is a set of numbers that state what is considered "local" and what is considered "remote."  Anything that is not considered local is sent to the computer specified by the "default gateway."  Anything that is considered local is sent straight out to the local network, destined to the local machine.\par
@@ -86,6 +86,8 @@ Mask:\par
 \pard\widctlpar\sa200\sl276\slmult1\fs22\lang9 The mask has 24 ones in a row.  So it could also be represented as /24.  When it is compared, the first thing that happens is the subnet is masked out.  In the mask, the final set of numbers are zeroes.  The numbers where the mask is a 0 is dropped.  The resulting number is: 192.168.0.0.  This is called the "Network Address."  We do the same thing for both the source and destination IP.  Then we compare the Network Address of both of them.  If they have the same network address, then they are considered to be on the same network.  If they do not have the same network address, they are considered to be on different networks.\par
 \b VPNs:\par
 \b0 A VPN stands for a "Virtual Private Network."  It is used to make a secure connection between computers or networks, usually across the Internet.  It is usually used in the context of either someone working from home and wanting to access printers or file-shares off the office network.  Or, two different networks wish to be connected (two offices in different states, etc).\par
+A VPN has an IP address, which is defined like any other IP address.  That IP-Address should be on a subnet that is unique to the VPN (such as 192.168.50.1).  The VPN also has a VPN endpoint.  The endpoint is the external IP address of the firewall that has the other end of the VPN.\par
+The VPN also has an encryption key.  This encryption key is supposed to be hard to guess, and it is must be the same at both ends of the VPN.  The key is case-sensitive.\par
 \b DEVICES:\par
 Hubs:\par
 \b0 A Hub is a very simple networking device.  When a packet comes into a hub, the packet is sent out of the rest of the network wires (links) attached to it.  The packet is not sent out of the wire that it came in on.\b\par
diff --git a/EduNetworkBuilder/Resources/Level2_Bad_Encryption.enbx b/EduNetworkBuilder/Resources/Level2_Bad_Encryption.enbx
index 88e64f8..02db6a3 100644
--- a/EduNetworkBuilder/Resources/Level2_Bad_Encryption.enbx
+++ b/EduNetworkBuilder/Resources/Level2_Bad_Encryption.enbx
@@ -1,9 +1,9 @@
-<?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 VPNs need their encryption keys fixed.  Ping from pc0 to pc1 to ensure it works.</message>
-    <title>Bad Encryption</title>
+    <en_message>The VPNs need their encryption keys fixed.  Ping from pc0 to pc1 to ensure it works.</en_message>
+    <en_title>Bad Encryption</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -176,6 +180,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -198,6 +203,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -220,6 +226,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -242,6 +249,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -320,6 +328,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -342,6 +351,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -379,6 +389,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -401,6 +412,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -438,6 +450,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -460,6 +473,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -482,6 +496,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -504,6 +519,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -526,6 +542,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -548,6 +565,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -570,6 +588,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -592,6 +611,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -614,6 +634,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -651,6 +672,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -673,6 +695,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -695,6 +718,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -717,6 +741,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -739,6 +764,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -761,6 +787,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -783,6 +810,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -805,6 +833,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -827,6 +856,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -864,6 +894,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -886,6 +917,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -923,6 +955,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -945,6 +978,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -982,6 +1016,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1004,6 +1039,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1026,6 +1062,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1051,6 +1088,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1067,6 +1105,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1083,6 +1122,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1099,6 +1139,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1115,6 +1156,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1131,6 +1173,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1147,6 +1190,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
     <link>
@@ -1163,6 +1207,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <nettest>
@@ -1170,5 +1215,6 @@
       <dhost>pc1</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>VPN</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_Bad_Route.enbx b/EduNetworkBuilder/Resources/Level2_Bad_Route.enbx
index 4ca0bd5..41f3de4 100644
--- a/EduNetworkBuilder/Resources/Level2_Bad_Route.enbx
+++ b/EduNetworkBuilder/Resources/Level2_Bad_Route.enbx
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>One of the firewalls is missing a route to tell it to use the VPN.  Configure the route and then ping from pc0 to pc1 to make sure it works.</message>
-    <title>Bad Route</title>
+    <en_message>One of the firewalls is missing a route to tell it to use the VPN.  Configure the route and then ping from pc0 to pc1 to make sure it works.</en_message>
+    <en_title>Bad Route</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -170,6 +174,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -192,6 +197,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -214,6 +220,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -236,6 +243,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -314,6 +322,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -336,6 +345,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -373,6 +383,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -395,6 +406,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -432,6 +444,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -454,6 +467,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -476,6 +490,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -498,6 +513,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -520,6 +536,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -542,6 +559,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -564,6 +582,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -586,6 +605,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -608,6 +628,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -645,6 +666,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -667,6 +689,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -689,6 +712,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -711,6 +735,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -733,6 +758,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -755,6 +781,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -777,6 +804,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -799,6 +827,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -821,6 +850,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -858,6 +888,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -880,6 +911,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -917,6 +949,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -939,6 +972,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -976,6 +1010,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -998,6 +1033,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1020,6 +1056,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1045,6 +1082,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1061,6 +1099,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1077,6 +1116,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1093,6 +1133,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1109,6 +1150,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1125,6 +1167,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1141,6 +1184,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
     <link>
@@ -1157,6 +1201,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <nettest>
@@ -1169,5 +1214,6 @@
       <dhost>192.168.2.0</dhost>
       <thetest>NeedsRouteToNet</thetest>
     </nettest>
+    <tag>StaticRoute</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_Blast_From_Past.enbx b/EduNetworkBuilder/Resources/Level2_Blast_From_Past.enbx
index e152f8a..f2c4b47 100644
--- a/EduNetworkBuilder/Resources/Level2_Blast_From_Past.enbx
+++ b/EduNetworkBuilder/Resources/Level2_Blast_From_Past.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>There are a few problems with this puzzle.  PC0 needs to ping PC1, and PC1 needs to ping PC0</message>
-    <title>Blast from the past</title>
+    <en_message>There are a few problems with this puzzle.  PC0 needs to ping PC1, and PC1 needs to ping PC0</en_message>
+    <en_title>Blast from the past</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -182,6 +186,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -204,6 +209,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -226,6 +232,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -248,6 +255,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -326,6 +334,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -348,6 +357,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -385,6 +395,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -407,6 +418,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -444,6 +456,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -466,6 +479,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -488,6 +502,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -510,6 +525,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -532,6 +548,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -554,6 +571,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -576,6 +594,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -598,6 +617,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -620,6 +640,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -657,6 +678,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -679,6 +701,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -701,6 +724,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -723,6 +747,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -745,6 +770,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -767,6 +793,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -789,6 +816,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -811,6 +839,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -833,6 +862,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -853,7 +883,7 @@
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
       <gateway>
-        <ip>0.0.0.0</ip>
+        <ip>192.168.1.1</ip>
         <mask>0.0.0.0</mask>
         <gateway>0.0.0.0</gateway>
         <type>gw</type>
@@ -870,6 +900,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -892,6 +923,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -929,6 +961,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -951,10 +984,11 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
-            <ip>192.168.3.5</ip>
+            <ip>192.168.2.5</ip>
             <mask>255.255.255.0</mask>
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
@@ -988,6 +1022,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1010,6 +1045,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1032,6 +1068,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1057,6 +1094,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1073,6 +1111,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1089,6 +1128,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1105,6 +1145,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1121,6 +1162,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1137,6 +1179,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1153,6 +1196,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
     <link>
@@ -1169,6 +1213,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <nettest>
@@ -1181,5 +1226,7 @@
       <dhost>pc0</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>Gateway</tag>
+    <tag>IPAddress</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_Build_A_VPN.enbx b/EduNetworkBuilder/Resources/Level2_Build_A_VPN.enbx
index a2beaf2..07f7044 100644
--- a/EduNetworkBuilder/Resources/Level2_Build_A_VPN.enbx
+++ b/EduNetworkBuilder/Resources/Level2_Build_A_VPN.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>Both firewalls need their VPNs configured.  Do not forget to make the right routes!  </message>
-    <title>Build a VPN</title>
+    <en_message>Both firewalls need their VPNs configured.  Do not forget to make the right routes!  </en_message>
+    <en_title>Build a VPN</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>vpn</nictype>
         <uniqueidentifier>157</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <tunnelendpoint>
           <ip>0.0.0.0</ip>
           <mask>255.255.255.0</mask>
@@ -147,6 +151,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -169,6 +174,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -191,6 +197,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -213,6 +220,7 @@
         <nictype>vpn</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <tunnelendpoint>
           <ip>0.0.0.0</ip>
           <mask>255.255.255.0</mask>
@@ -256,6 +264,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -278,6 +287,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -315,6 +325,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -337,6 +348,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -374,6 +386,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -396,6 +409,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -418,6 +432,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -440,6 +455,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -462,6 +478,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -484,6 +501,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -506,6 +524,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -528,6 +547,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -550,6 +570,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -587,6 +608,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -609,6 +631,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -631,6 +654,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -653,6 +677,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -675,6 +700,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -697,6 +723,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -719,6 +746,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -741,6 +769,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -763,6 +792,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -800,6 +830,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -822,6 +853,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -859,6 +891,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -881,6 +914,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -918,6 +952,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -940,6 +975,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -962,6 +998,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -987,6 +1024,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1003,6 +1041,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1019,6 +1058,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1035,6 +1075,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1051,6 +1092,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1067,6 +1109,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1083,6 +1126,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
     <link>
@@ -1099,6 +1143,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <nettest>
@@ -1117,5 +1162,6 @@
       <thetest>SuccessfullyPings</thetest>
     </nettest>
     <tag>VPN</tag>
+    <tag>StaticRoute</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_Connect_The_Dots.enbx b/EduNetworkBuilder/Resources/Level2_Connect_The_Dots.enbx
index a85e776..051e9a0 100644
--- a/EduNetworkBuilder/Resources/Level2_Connect_The_Dots.enbx
+++ b/EduNetworkBuilder/Resources/Level2_Connect_The_Dots.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>Connect the firewalls to the router, setting up working IPs.  Do not forget the VPN!</message>
-    <title>Connect the dots</title>
+    <en_message>Connect the firewalls to the router, setting up working IPs.  Do not forget the VPN!</en_message>
+    <en_title>Connect the dots</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -182,6 +186,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -204,6 +209,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -226,6 +232,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -248,6 +255,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -326,6 +334,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -348,6 +357,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -385,6 +395,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -407,6 +418,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -444,6 +456,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -466,6 +479,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -488,6 +502,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -510,6 +525,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -532,6 +548,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -554,6 +571,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -576,6 +594,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -598,6 +617,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -620,6 +640,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -657,6 +678,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -679,6 +701,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -701,6 +724,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -723,6 +747,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -745,6 +770,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -767,6 +793,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -789,6 +816,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -811,6 +839,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -833,6 +862,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -870,6 +900,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -892,6 +923,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -929,6 +961,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -951,6 +984,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -988,6 +1022,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1010,6 +1045,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1032,6 +1068,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1057,6 +1094,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1073,6 +1111,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1089,6 +1128,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1105,6 +1145,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1121,6 +1162,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1137,6 +1179,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <nettest>
@@ -1149,5 +1192,9 @@
       <dhost>pc1</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>IPAddress</tag>
+    <tag>Link</tag>
+    <tag>VPN</tag>
+    <tag>StaticRoute</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_FirewallDemo.enbx b/EduNetworkBuilder/Resources/Level2_FirewallDemo.enbx
index f5517c4..7ac3695 100644
--- a/EduNetworkBuilder/Resources/Level2_FirewallDemo.enbx
+++ b/EduNetworkBuilder/Resources/Level2_FirewallDemo.enbx
@@ -1,9 +1,9 @@
-<?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 puzzle shows off how a firewall works.  You can ping out of a firewall, but not ping the computers behind it.  To "solve" this, ping the lone computer from both subnets, and try to ping both subnets from the lone pc.</message>
-    <title>Firewall Test</title>
+    <en_message>This puzzle shows off how a firewall works.  You can ping out of a firewall, but not ping the computers behind it.  To "solve" this, ping the lone computer from both subnets, and try to ping both subnets from the lone pc.</en_message>
+    <en_title>Firewall Test</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -165,6 +169,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -187,6 +192,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -209,6 +215,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -231,6 +238,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -253,6 +261,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -275,6 +284,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -297,6 +307,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -319,6 +330,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -341,6 +353,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -378,6 +391,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -400,6 +414,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -422,6 +437,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -444,6 +460,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -466,6 +483,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -488,6 +506,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -510,6 +529,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -532,6 +552,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -554,6 +575,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -591,6 +613,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -613,6 +636,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -635,6 +659,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -657,6 +682,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -679,6 +705,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -701,6 +728,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -723,6 +751,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -745,6 +774,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -767,6 +797,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -804,6 +835,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -826,6 +858,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -863,6 +896,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -885,6 +919,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -922,6 +957,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -944,13 +980,14 @@
         <nictype>eth</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
-            <ip>192.168.1.5</ip>
-            <mask>255.255.255.0</mask>
-            <gateway>192.168.1.1</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>
         </interface>
       </nic>
@@ -981,6 +1018,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1003,6 +1041,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1040,6 +1079,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>155</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1062,13 +1102,14 @@
         <nictype>eth</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
-            <ip>192.168.2.5</ip>
-            <mask>255.255.255.0</mask>
-            <gateway>192.168.2.1</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>
         </interface>
       </nic>
@@ -1087,6 +1128,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>131</uniqueidentifier>
     </link>
     <link>
@@ -1103,6 +1145,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>132</uniqueidentifier>
     </link>
     <link>
@@ -1119,6 +1162,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>133</uniqueidentifier>
     </link>
     <link>
@@ -1135,6 +1179,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>134</uniqueidentifier>
     </link>
     <link>
@@ -1151,6 +1196,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>138</uniqueidentifier>
     </link>
     <link>
@@ -1167,6 +1213,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <link>
@@ -1183,6 +1230,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1199,6 +1247,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>157</uniqueidentifier>
     </link>
     <nettest>
diff --git a/EduNetworkBuilder/Resources/Level2_VPN_Demo.enbx b/EduNetworkBuilder/Resources/Level2_VPN_Demo.enbx
index 0abaef1..828cd3d 100644
--- a/EduNetworkBuilder/Resources/Level2_VPN_Demo.enbx
+++ b/EduNetworkBuilder/Resources/Level2_VPN_Demo.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>Some devices allow you to create VPNs.  A Virtual Private Network (VPN) allows you to connect up to things behind a firewall.  For this example, you need to ping from pc0 to a number of different things just to see how the VPN works.  Make sure you edit one or more of the firewalls to see how the VPN is configured, and see how the static route is defined to make the packets go through the VPN.  You will need to know how that works to solve the rest of this level.</message>
-    <title>VPN Demo</title>
+    <en_message>Some devices allow you to create VPNs.  A Virtual Private Network (VPN) allows you to connect up to things behind a firewall.  For this example, you need to ping from pc0 to a number of different things just to see how the VPN works.  Make sure you edit one or more of the firewalls to see how the VPN is configured, and see how the static route is defined to make the packets go through the VPN.  You will need to know how that works to solve the rest of this level.</en_message>
+    <en_title>VPN Demo</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -211,6 +215,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -233,6 +238,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -255,6 +261,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -277,6 +284,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -355,6 +363,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>159</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -377,6 +386,7 @@
         <nictype>wan</nictype>
         <uniqueidentifier>162</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -399,6 +409,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>160</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -421,6 +432,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>161</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -499,6 +511,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -521,6 +534,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -558,6 +572,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -580,6 +595,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -617,6 +633,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -639,6 +656,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>178</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -676,6 +694,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -698,6 +717,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -720,6 +740,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -742,6 +763,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -764,6 +786,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -786,6 +809,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -808,6 +832,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -830,6 +855,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -852,6 +878,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -889,6 +916,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -911,6 +939,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -933,6 +962,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -955,6 +985,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -977,6 +1008,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -999,6 +1031,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1021,6 +1054,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1043,6 +1077,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1065,6 +1100,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1102,6 +1138,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>164</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1124,6 +1161,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>165</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1146,6 +1184,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>166</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1168,6 +1207,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>167</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1190,6 +1230,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>168</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1212,6 +1253,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>169</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1234,6 +1276,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>170</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1256,6 +1299,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>171</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1278,6 +1322,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>172</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1315,6 +1360,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1337,6 +1383,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1374,6 +1421,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1396,6 +1444,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1433,6 +1482,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>174</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1455,6 +1505,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>175</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1492,6 +1543,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1514,6 +1566,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1536,6 +1589,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1558,6 +1612,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>182</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth2</nicname>
           <myip>
@@ -1583,6 +1638,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>147</uniqueidentifier>
     </link>
     <link>
@@ -1599,6 +1655,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>179</uniqueidentifier>
     </link>
     <link>
@@ -1615,6 +1672,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>146</uniqueidentifier>
     </link>
     <link>
@@ -1631,6 +1689,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>149</uniqueidentifier>
     </link>
     <link>
@@ -1647,6 +1706,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>150</uniqueidentifier>
     </link>
     <link>
@@ -1663,6 +1723,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>181</uniqueidentifier>
     </link>
     <link>
@@ -1679,6 +1740,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>153</uniqueidentifier>
     </link>
     <link>
@@ -1695,6 +1757,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>154</uniqueidentifier>
     </link>
     <link>
@@ -1711,6 +1774,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>155</uniqueidentifier>
     </link>
     <link>
@@ -1727,6 +1791,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>152</uniqueidentifier>
     </link>
     <link>
@@ -1743,6 +1808,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>180</uniqueidentifier>
     </link>
     <link>
@@ -1759,6 +1825,7 @@
         <nicname>eth2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>183</uniqueidentifier>
     </link>
     <nettest>
@@ -1786,7 +1853,6 @@
       <dhost>firewall2</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
-    <tag>firewall</tag>
     <tag>VPN</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level2_VPN_woes.enbx b/EduNetworkBuilder/Resources/Level2_VPN_woes.enbx
index 2d9b0a1..e06708e 100644
--- a/EduNetworkBuilder/Resources/Level2_VPN_woes.enbx
+++ b/EduNetworkBuilder/Resources/Level2_VPN_woes.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>For routing to work, you need to have different IP addresses on the other side of the route.  Here we have two networks that are using the same IP address scheme.  To get them to work, you will need to change the IP Addresses of one of the networks.  It is easiest to change the right network to be 192.168.2.x, as the left network has the right routes already set up for that network.</message>
-    <title>VPN Woes</title>
+    <en_message>For routing to work, you need to have different IP addresses on the other side of the route.  Here we have two networks that are using the same IP address scheme.  To get them to work, you will need to change the IP Addresses of one of the networks.  It is easiest to change the right network to be 192.168.2.x, as the left network has the right routes already set up for that network.</en_message>
+    <en_title>VPN Woes</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,7 +38,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -61,7 +60,6 @@
         <nictype>wan</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -84,7 +82,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -107,7 +104,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -180,7 +176,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -203,7 +198,6 @@
         <nictype>wan</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -226,7 +220,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -249,7 +242,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -328,7 +320,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -351,7 +342,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -389,7 +379,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -412,7 +401,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -450,7 +438,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -473,7 +460,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -496,7 +482,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -519,7 +504,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -542,7 +526,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -565,7 +548,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -588,7 +570,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -611,7 +592,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -634,7 +614,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -672,7 +651,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -695,7 +673,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -718,7 +695,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -741,7 +717,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -764,7 +739,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -787,7 +761,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -810,7 +783,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -833,7 +805,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -856,7 +827,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -894,7 +864,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -917,7 +886,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -955,7 +923,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -978,7 +945,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1016,7 +982,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1039,7 +1004,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1062,7 +1026,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1085,7 +1048,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>182</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
         <interface>
           <nicname>eth2</nicname>
           <myip>
@@ -1238,5 +1200,7 @@
       <dhost>pc1</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>Subnet</tag>
+    <tag>VPN</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file