diff --git a/EduNetworkBuilder/RTFWindow.cs b/EduNetworkBuilder/RTFWindow.cs
index 2db2f31..924c68c 100644
--- a/EduNetworkBuilder/RTFWindow.cs
+++ b/EduNetworkBuilder/RTFWindow.cs
@@ -40,6 +40,7 @@ namespace EduNetworkBuilder
                     newlocation = new Point(Screen.PrimaryScreen.Bounds.Width - 5, newlocation.Y);
                 }
                 Location = newlocation;
+                Height = myWin.Height;
             }
             System.Drawing.Font currentFont = rtbContent.SelectionFont;
             Text = title;
@@ -76,6 +77,7 @@ namespace EduNetworkBuilder
                     newlocation = new Point(Screen.PrimaryScreen.Bounds.Width - 5, newlocation.Y);
                 }
                 Location = newlocation;
+                Height = myWin.Height;
             }
             if (WhatToShow == RTFWindowContents.help)
             {                
diff --git a/EduNetworkBuilder/Resources/Help.rtf b/EduNetworkBuilder/Resources/Help.rtf
index 5f5f6ba..fba48c7 100644
--- a/EduNetworkBuilder/Resources/Help.rtf
+++ b/EduNetworkBuilder/Resources/Help.rtf
@@ -45,7 +45,8 @@ 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.  Most IP addresses are reserved for specific people, places, and things.  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\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
+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
 The netmask usually looks something like 255.255.255.0.  In binary, this looks like: \par
diff --git a/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx b/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
index 67965c7..4828588 100644
--- a/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
+++ b/EduNetworkBuilder/Resources/Level1-DuplicateIPs.enbx
@@ -2,8 +2,8 @@
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>Get the PCs so they are happy</message>
-    <title>Duplicate IPs</title>
+    <en_message>Get the PCs so they are happy</en_message>
+    <en_title>Duplicate IPs</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -82,6 +84,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -104,6 +107,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -126,6 +130,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -148,6 +153,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -170,6 +176,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -192,6 +199,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>152</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -214,6 +222,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>153</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -251,6 +260,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -273,6 +283,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -310,6 +321,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -332,6 +344,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -369,6 +382,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -391,6 +405,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -428,6 +443,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -450,6 +466,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -487,6 +504,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>155</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -509,6 +527,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -546,6 +565,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>157</uniqueidentifier>
     </link>
     <link>
@@ -562,6 +582,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>158</uniqueidentifier>
     </link>
     <link>
@@ -578,6 +599,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>159</uniqueidentifier>
     </link>
     <link>
@@ -594,6 +616,7 @@
         <nicname>port4</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>160</uniqueidentifier>
     </link>
     <link>
@@ -610,6 +633,7 @@
         <nicname>port5</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>161</uniqueidentifier>
     </link>
     <nettest>
@@ -632,6 +656,6 @@
       <dhost>server0</dhost>
       <thetest>NeedsLocalIPTo</thetest>
     </nettest>
-    <tag>IP</tag>
+    <tag>IPAddress</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx b/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
index c57be9e..e3fd141 100644
--- a/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
+++ b/EduNetworkBuilder/Resources/Level1-MidDHCP.enbx
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EduNetworkBuilder>
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
-    <message>These IP-Phones cannot have a static IP.  You must add a server on the 192.168.1.0 network and configure the DHCP server.  Give an IP to the phone, so the phone can ping the PCs on the other side of the network</message>
-    <title>Add DHCP Server</title>
+    <en_message>These IP-Phones cannot have a static IP.  You must add a server on the 192.168.1.0 network and configure the DHCP server.  Give an IP to the phone, so the phone can ping the PCs on the other side of the network</en_message>
+    <en_title>Add DHCP Server</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
     <showlabels>False</showlabels>
     <level>1</level>
-    <sortorder>05.00</sortorder>
+    <sortorder>5</sortorder>
     <uniqueidentifier>146</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
     <device>
@@ -38,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -60,6 +61,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -97,6 +99,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -119,6 +122,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -141,6 +145,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -163,6 +168,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -185,6 +191,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -207,6 +214,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -229,6 +237,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -251,6 +260,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -273,6 +283,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -310,6 +321,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -332,6 +344,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -354,6 +367,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -376,6 +390,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -398,6 +413,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -420,6 +436,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>126</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -442,6 +459,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -464,6 +482,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -486,6 +505,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -523,6 +543,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -545,6 +566,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -582,6 +604,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -604,6 +627,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -641,6 +665,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -663,6 +688,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -700,6 +726,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -722,6 +749,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -744,6 +772,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -769,6 +798,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>139</uniqueidentifier>
     </link>
     <link>
@@ -785,6 +815,7 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>140</uniqueidentifier>
     </link>
     <link>
@@ -801,6 +832,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>141</uniqueidentifier>
     </link>
     <link>
@@ -817,6 +849,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>142</uniqueidentifier>
     </link>
     <link>
@@ -833,6 +866,7 @@
         <nicname>eth1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>143</uniqueidentifier>
     </link>
     <link>
@@ -849,6 +883,7 @@
         <nicname>port3</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>145</uniqueidentifier>
     </link>
     <nettest>
@@ -861,5 +896,6 @@
       <dhost>pc0</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>DHCPServer</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-MixedNetwork.enbx b/EduNetworkBuilder/Resources/Level1-MixedNetwork.enbx
index 7e2968b..f139bba 100644
--- a/EduNetworkBuilder/Resources/Level1-MixedNetwork.enbx
+++ b/EduNetworkBuilder/Resources/Level1-MixedNetwork.enbx
@@ -1,20 +1,81 @@
-<?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 has three tasks to it:
+    <en_message>This puzzle has three tasks to it:
 1) Give the switch an IP address
 2) Add an IP-Phone to the network, linking it to the switch, and then do a DHCP request for it.
-3) Ping the switch from the IP-Phone</message>
-    <title>Adding Devices</title>
+3) Ping the switch from the IP-Phone</en_message>
+    <en_title>Adding Devices</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
     <showlabels>True</showlabels>
     <level>1</level>
     <sortorder>4.3</sortorder>
-    <uniqueidentifier>121</uniqueidentifier>
+    <uniqueidentifier>125</uniqueidentifier>
     <startinghelplevel>basic</startinghelplevel>
+    <device>
+      <hostname>ip_phone0</hostname>
+      <size>100</size>
+      <uniqueidentifier>121</uniqueidentifier>
+      <location>560,500</location>
+      <mytype>ip_phone</mytype>
+      <isdns>False</isdns>
+      <isdhcp>False</isdhcp>
+      <gateway>
+        <ip>0.0.0.0</ip>
+        <mask>0.0.0.0</mask>
+        <gateway>0.0.0.0</gateway>
+        <type>gw</type>
+      </gateway>
+      <nic>
+        <nictype>lo</nictype>
+        <nicname>lo0</nicname>
+        <myid>
+          <hostid>121</hostid>
+          <nicid>122</nicid>
+          <hostname>ip_phone0</hostname>
+          <nicname>lo0</nicname>
+        </myid>
+        <nictype>lo</nictype>
+        <uniqueidentifier>122</uniqueidentifier>
+        <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <interface>
+          <nicname>lo0</nicname>
+          <myip>
+            <ip>127.0.0.1</ip>
+            <mask>255.0.0.0</mask>
+            <gateway>0.0.0.0</gateway>
+            <type>ip</type>
+          </myip>
+        </interface>
+      </nic>
+      <nic>
+        <nictype>eth</nictype>
+        <nicname>eth0</nicname>
+        <myid>
+          <hostid>121</hostid>
+          <nicid>123</nicid>
+          <hostname>ip_phone0</hostname>
+          <nicname>eth0</nicname>
+        </myid>
+        <nictype>eth</nictype>
+        <uniqueidentifier>123</uniqueidentifier>
+        <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <interface>
+          <nicname>eth0</nicname>
+          <myip>
+            <ip>192.168.1.20</ip>
+            <mask>255.255.255.0</mask>
+            <gateway>192.168.1.254</gateway>
+            <type>route</type>
+          </myip>
+        </interface>
+      </nic>
+    </device>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -41,6 +102,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -63,11 +125,12 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
-            <ip>0.0.0.0</ip>
-            <mask>0.0.0.0</mask>
+            <ip>192.168.1.4</ip>
+            <mask>255.255.255.0</mask>
             <gateway>0.0.0.0</gateway>
             <type>ip</type>
           </myip>
@@ -85,6 +148,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -107,6 +171,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -129,6 +194,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -151,6 +217,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -173,6 +240,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -195,6 +263,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -217,6 +286,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -254,6 +324,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -276,6 +347,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -313,6 +385,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -335,6 +408,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -372,6 +446,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>116</uniqueidentifier>
     </link>
     <link>
@@ -388,8 +463,26 @@
         <nicname>port2</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>117</uniqueidentifier>
     </link>
+    <link>
+      <SrcNic>
+        <hostid>121</hostid>
+        <nicid>123</nicid>
+        <hostname>ip_phone0</hostname>
+        <nicname>eth0</nicname>
+      </SrcNic>
+      <DstNic>
+        <hostid>103</hostid>
+        <nicid>108</nicid>
+        <hostname>net_switch0</hostname>
+        <nicname>port3</nicname>
+      </DstNic>
+      <hostname />
+      <linktype>normal</linktype>
+      <uniqueidentifier>124</uniqueidentifier>
+    </link>
     <nettest>
       <shost>net_switch0</shost>
       <dhost>server0</dhost>
@@ -400,5 +493,6 @@
       <dhost>net_switch0</dhost>
       <thetest>SuccessfullyPings</thetest>
     </nettest>
+    <tag>DHCP</tag>
   </Network>
 </EduNetworkBuilder>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level1-NoGateway.enbx b/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
index 8228f2b..e781587 100644
--- a/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
+++ b/EduNetworkBuilder/Resources/Level1-NoGateway.enbx
@@ -1,16 +1,17 @@
-<?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 items on one network cannot ping the items on the other network (separated by the router).  Figure why and fix it.  All computers and switches need fixing, but the router is OK.</message>
-    <title>Gateway Puzzle</title>
+    <en_message>The items on one network cannot ping the items on the other network (separated by the router).  Figure why and fix it.  All computers and switches need fixing, but the router is OK.</en_message>
+    <en_title>Gateway Puzzle</en_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
     <showlabels>False</showlabels>
-    <uniqueidentifier>142</uniqueidentifier>
     <level>1</level>
-    <sortorder>03.00</sortorder>
+    <sortorder>3</sortorder>
+    <uniqueidentifier>142</uniqueidentifier>
+    <startinghelplevel>none</startinghelplevel>
     <device>
       <hostname>net_switch0</hostname>
       <size>100</size>
@@ -37,6 +38,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -59,6 +61,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -81,6 +84,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -103,6 +107,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -125,6 +130,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -147,6 +153,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -169,6 +176,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -191,6 +199,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -213,6 +222,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>109</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -250,6 +260,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>127</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -272,6 +283,7 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>128</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -294,6 +306,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -316,6 +329,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>130</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -338,6 +352,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -360,6 +375,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -382,6 +398,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -404,6 +421,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -426,6 +444,7 @@
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -463,6 +482,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -485,6 +505,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -522,6 +543,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -544,6 +566,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -581,6 +604,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -603,6 +627,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -640,6 +665,7 @@
         <nictype>lo</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -662,6 +688,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -684,6 +711,7 @@
         <nictype>eth</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -709,6 +737,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>119</uniqueidentifier>
     </link>
     <link>
@@ -725,6 +754,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>120</uniqueidentifier>
     </link>
     <link>
@@ -741,6 +771,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>139</uniqueidentifier>
     </link>
     <link>
@@ -757,6 +788,7 @@
         <nicname>port1</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>140</uniqueidentifier>
     </link>
     <link>
@@ -773,6 +805,7 @@
         <nicname>eth0</nicname>
       </DstNic>
       <hostname />
+      <linktype>normal</linktype>
       <uniqueidentifier>141</uniqueidentifier>
     </link>
     <nettest>