diff --git a/Anvil/Tools/Database.pm b/Anvil/Tools/Database.pm
index 9792d71c..7b4f5612 100644
--- a/Anvil/Tools/Database.pm
+++ b/Anvil/Tools/Database.pm
@@ -2462,6 +2462,12 @@ sub insert_or_update_bonds
 		$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Database->insert_or_update_bonds()", parameter => "bond_mode" }});
 		return("");
 	}
+	if (not $bond_bridge_uuid)
+	{
+		# This has to be 'NULL' if not defined.
+		$bond_bridge_uuid = 'NULL';
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { bond_bridge_uuid => $bond_bridge_uuid }});
+	}
 	
 	# If we don't have a UUID, see if we can find one for the given bond server name.
 	if (not $bond_uuid)
@@ -2558,6 +2564,7 @@ INSERT INTO
     ".$anvil->Database->quote($anvil->data->{sys}{database}{timestamp})."
 );
 ";
+		$query =~ s/'NULL'/NULL/g;
 		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }});
 		$anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__});
 	}
diff --git a/Anvil/Tools/System.pm b/Anvil/Tools/System.pm
index 10f7e2e5..2ed97cd4 100644
--- a/Anvil/Tools/System.pm
+++ b/Anvil/Tools/System.pm
@@ -23,11 +23,12 @@ my $THIS_FILE = "System.pm";
 # check_if_configured
 # check_memory
 # check_storage
+# disable_daemon
+# enable_daemon
+# find_matching_ip
 # get_bridges
 # get_free_memory
 # get_host_type
-# enable_daemon
-# find_matching_ip
 # get_uptime
 # get_os_type
 # host_name
@@ -796,6 +797,38 @@ sub check_storage
 	return(0);
 }
 
+=head2 disable_daemon
+
+This method disables a daemon. The return code from the disable request will be returned.
+
+If the return code for the disable command wasn't read, C<< !!error!! >> is returned.
+
+Parameters;
+
+=head3 daemon (required)
+
+This is the name of the daemon to disable. The exact name given is passed to C<< systemctl >>, so please be mindful of appropriate suffixes.
+
+=cut
+sub disable_daemon
+{
+	my $self      = shift;
+	my $parameter = shift;
+	my $anvil     = $self->parent;
+	my $debug     = defined $parameter->{debug} ? $parameter->{debug} : 3;
+	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "System->disable_daemon()" }});
+	
+	my $return = 9999;
+	my $daemon = defined $parameter->{daemon} ? $parameter->{daemon} : "";
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { daemon => $daemon }});
+	
+	my ($output, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{systemctl}." disable ".$daemon});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { output => $output, return_code => $return_code }});
+	
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 'return' => $return }});
+	return($return);
+}
+
 =head2 generate_state_json
 
 This method generates the C<< all_status.json >> file. 
@@ -1340,82 +1373,6 @@ sub get_free_memory
 	return($available);
 }
 
-=head2 get_host_type
-
-This method tries to determine the host type and returns a value suitable for use is the C<< hosts >> table.
-
- my $type = $anvil->System->get_host_type();
-
-First, it looks to see if C<< sys::host_type >> is set and, if so, uses that string as it is. 
-
-If that isn't set, it then looks to see if the file C<< /etc/anvil/type.X >> exists, where C<< X >> is C<< node >>, C<< dashboard >> or C<< dr >>. If found, the appropriate type is returned.
-
-If that file doesn't exist, then it looks at the short host name. The following rules are used, in order;
-
-1. If the host name ends in C<< n<digits> >> or C<< node<digits> >>, C<< node >> is returned.
-2. If the host name ends in C<< striker<digits> >> or C<< dashboard<digits> >>, C<< dashboard >> is returned.
-3. If the host name ends in C<< dr<digits> >>, C<< dr >> is returned.
-
-=cut
-sub get_host_type
-{
-	my $self      = shift;
-	my $parameter = shift;
-	my $anvil     = $self->parent;
-	my $debug     = defined $parameter->{debug} ? $parameter->{debug} : 3;
-	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "System->get_host_type()" }});
-	
-	my $host_type = "";
-	my $host_name = $anvil->_short_host_name;
-	   $host_type = "unknown";
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
-		host_type        => $host_type,
-		host_name        => $host_name,
-		"sys::host_type" => $anvil->data->{sys}{host_type},
-	}});
-	if ($anvil->data->{sys}{host_type})
-	{
-		$host_type = $anvil->data->{sys}{host_type};
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-	}
-	else
-	{
-		# Can I determine it by seeing a file?
-		if (-e $anvil->data->{path}{configs}{'type.node'})
-		{
-			$host_type = "node";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-		elsif (-e $anvil->data->{path}{configs}{'type.dashboard'})
-		{
-			$host_type = "dashboard";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-		elsif (-e $anvil->data->{path}{configs}{'type.dr'})
-		{
-			$host_type = "dr";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-		elsif (($host_name =~ /n\d+$/) or ($host_name =~ /node\d+$/) or ($host_name =~ /new-node+$/))
-		{
-			$host_type = "node";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-		elsif (($host_name =~ /striker\d+$/) or ($host_name =~ /dashboard\d+$/))
-		{
-			$host_type = "dashboard";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-		elsif (($host_name =~ /dr\d+$/) or ($host_name =~ /new-dr$/))
-		{
-			$host_type = "dr";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
-		}
-	}
-	
-	return($host_type);
-}
-
 =head2 enable_daemon
 
 This method enables a daemon (so that it starts when the OS boots). The return code from the start request will be returned.
@@ -1535,6 +1492,82 @@ sub find_matching_ip
 	return($local_ip);
 }
 
+=head2 get_host_type
+
+This method tries to determine the host type and returns a value suitable for use is the C<< hosts >> table.
+
+ my $type = $anvil->System->get_host_type();
+
+First, it looks to see if C<< sys::host_type >> is set and, if so, uses that string as it is. 
+
+If that isn't set, it then looks to see if the file C<< /etc/anvil/type.X >> exists, where C<< X >> is C<< node >>, C<< dashboard >> or C<< dr >>. If found, the appropriate type is returned.
+
+If that file doesn't exist, then it looks at the short host name. The following rules are used, in order;
+
+1. If the host name ends in C<< n<digits> >> or C<< node<digits> >>, C<< node >> is returned.
+2. If the host name ends in C<< striker<digits> >> or C<< dashboard<digits> >>, C<< dashboard >> is returned.
+3. If the host name ends in C<< dr<digits> >>, C<< dr >> is returned.
+
+=cut
+sub get_host_type
+{
+	my $self      = shift;
+	my $parameter = shift;
+	my $anvil     = $self->parent;
+	my $debug     = defined $parameter->{debug} ? $parameter->{debug} : 3;
+	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "System->get_host_type()" }});
+	
+	my $host_type = "";
+	my $host_name = $anvil->_short_host_name;
+	   $host_type = "unknown";
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
+		host_type        => $host_type,
+		host_name        => $host_name,
+		"sys::host_type" => $anvil->data->{sys}{host_type},
+	}});
+	if ($anvil->data->{sys}{host_type})
+	{
+		$host_type = $anvil->data->{sys}{host_type};
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+	}
+	else
+	{
+		# Can I determine it by seeing a file?
+		if (-e $anvil->data->{path}{configs}{'type.node'})
+		{
+			$host_type = "node";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+		elsif (-e $anvil->data->{path}{configs}{'type.dashboard'})
+		{
+			$host_type = "dashboard";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+		elsif (-e $anvil->data->{path}{configs}{'type.dr'})
+		{
+			$host_type = "dr";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+		elsif (($host_name =~ /n\d+$/) or ($host_name =~ /node\d+$/) or ($host_name =~ /new-node+$/))
+		{
+			$host_type = "node";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+		elsif (($host_name =~ /striker\d+$/) or ($host_name =~ /dashboard\d+$/))
+		{
+			$host_type = "dashboard";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+		elsif (($host_name =~ /dr\d+$/) or ($host_name =~ /new-dr$/))
+		{
+			$host_type = "dr";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+		}
+	}
+	
+	return($host_type);
+}
+
 =head2 get_uptime
 
 This returns, in seconds, how long the host has been up and running for. 
@@ -2097,6 +2130,9 @@ sub manage_firewall
 		protocol    => $protocol, 
 	}});
 	
+	### NOTE: Disabled during development
+	return(0);
+	
 	# Make sure we have a port or service.
 	if (not $port_number)
 	{
diff --git a/rpm/SPECS/anvil.spec b/rpm/SPECS/anvil.spec
index 70ab727b..6220f533 100644
--- a/rpm/SPECS/anvil.spec
+++ b/rpm/SPECS/anvil.spec
@@ -3,7 +3,7 @@
 %define anvilgroup    admin
 Name:           anvil
 Version:        3.0
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        Alteeve Anvil! complete package.
 
 License:        GPLv2+
@@ -352,6 +352,9 @@ fi
 
 
 %changelog
+* tbd Madison Kelly <mkelly@alteeve.ca> 3.0-31
+- 
+
 * Fri Dec 13 2019 Madison Kelly <mkelly@alteeve.ca> 3.0-30
 - Enabled/started chronyd in core's post.
 - Updated source.
diff --git a/tools/anvil-manage-firewall b/tools/anvil-manage-firewall
index a8d8ecb8..fd43237b 100755
--- a/tools/anvil-manage-firewall
+++ b/tools/anvil-manage-firewall
@@ -10,6 +10,7 @@
 # 2 = Failed to write or update a file.
 # 
 # TODO:
+# - TEMP: During development, firewalling is disabled.
 # - Add support for enabling/disabling MASQ'ing the BCN
 #   
 #   # Allow routing/masq'ing through the IFN1 (provide net access to the BCN)
@@ -55,7 +56,19 @@ $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level
 $anvil->data->{switches}{'y'} = "";
 $anvil->Get->switches;
 
-$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 3, key => "message_0134"});
+# For now, we just disable the firewall, if it is enabled.
+my $firewall_running = $anvil->System->check_daemon({daemon => "firewalld", debug => 3});
+$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { firewall_running => $firewall_running }});
+if ($firewall_running eq "1")
+{
+	# Disable it.
+	$anvil->System->stop_daemon({daemon => "firewalld", debug => 2});
+	$anvil->System->disable_daemon({daemon => "firewalld", debug => 2});
+}
+$anvil->nice_exit({exit_code => 0});
+
+
+$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "message_0134"});
 check_initial_setup($anvil);
 
 ### TODO:
@@ -102,39 +115,37 @@ sub check_initial_setup
 	
 	# Get the list of existing zones from iptables/firewalld.
 	$anvil->System->check_firewall({debug => 3});
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "firewall::default_zone" => $anvil->data->{firewall}{default_zone} }});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "firewall::default_zone" => $anvil->data->{firewall}{default_zone} }});
 	
 	my $internet_zone = "";
 	foreach my $interface (sort {$a cmp $b} keys %{$anvil->data->{network}{'local'}{interface}})
 	{
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { interface => $interface }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { interface => $interface }});
 		if ($interface =~ /^((bcn|ifn|sn)\d+)_/)
 		{
 			# We'll use the start of the string (network type) as the zone, though it should 
 			# always be overridden by the ZONE="" variable in each interface's config.
 			my $zone = $1;
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { zone => $zone }});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { zone => $zone }});
 			if ((exists $anvil->data->{network}{'local'}{interface}{$interface}{variable}{ZONE}) && ($anvil->data->{network}{'local'}{interface}{$interface}{variable}{ZONE}))
 			{
 				$zone = $anvil->data->{network}{'local'}{interface}{$interface}{variable}{ZONE};
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { zone => $zone }});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { zone => $zone }});
 			}
 			push @{$needed_zones}, $zone;
 			
 			$anvil->data->{firewall}{zone}{$zone}{interface}{$interface}{ip}          = $anvil->data->{network}{'local'}{interface}{$interface}{ip};
 			$anvil->data->{firewall}{zone}{$zone}{interface}{$interface}{subnet_mask} = $anvil->data->{network}{'local'}{interface}{$interface}{subnet_mask};
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				"firewall::zone::${zone}::interface::${interface}::ip"          => $anvil->data->{firewall}{zone}{$zone}{interface}{$interface}{ip},
 				"firewall::zone::${zone}::interface::${interface}::subnet_mask" => $anvil->data->{firewall}{zone}{$zone}{interface}{$interface}{subnet_mask},
+				"network::local::interface::${interface}::default_gateway"      => $anvil->data->{network}{'local'}{interface}{$interface}{default_gateway},
 			}});
 			
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
-				"network::local::interface::${interface}::default_gateway" => $anvil->data->{network}{'local'}{interface}{$interface}{default_gateway},
-			}});
 			if ($anvil->data->{network}{'local'}{interface}{$interface}{default_gateway})
 			{
 				$internet_zone = $zone;
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { internet_zone => $internet_zone }});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { internet_zone => $internet_zone }});
 				
 				if ((not $anvil->data->{firewall}{default_zone}) or ($anvil->data->{firewall}{default_zone} eq "public"))
 				{
@@ -151,7 +162,7 @@ sub check_initial_setup
 	{
 		my $file      = exists $anvil->data->{firewall}{zone}{$zone}{file} ? $anvil->data->{firewall}{zone}{$zone}{file} : $anvil->data->{path}{directories}{firewalld_zones}."/".$zone.".xml";
 		my $user_file = $anvil->data->{path}{directories}{firewalld_zones_etc}."/".$zone.".xml";
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 			"s1:zone"      => $zone,
 			"s2:file"      => $file, 
 			"s3:user_file" => $user_file, 
@@ -162,20 +173,20 @@ sub check_initial_setup
 		my $wanted = 0;
 		foreach my $needed_zone (sort {$a cmp $b} @{$needed_zones})
 		{
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				"s1:zone"        => $zone,
 				"s2:needed_zone" => $needed_zone,
 			}});
 			if ($needed_zone eq $zone)
 			{
 				$wanted = 1;
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { wanted => $wanted }});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { wanted => $wanted }});
 				last;
 			}
 		}
 		
 		# Skip if this is a zone I don't care about.
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { wanted => $wanted }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { wanted => $wanted }});
 		next if not $wanted;
 		
 		# Now, skip if the user-land file exists.
@@ -211,7 +222,7 @@ sub check_initial_setup
 			# This should never be hit, but it's a fail-safe in we're in a zone we don't manage.
 			next;
 		}
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 			"s1:template"    => $template,
 			"s2:description" => $description, 
 		}});
@@ -220,7 +231,7 @@ sub check_initial_setup
 			zone        => $zone,
 			description => $description,
 		}});
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_zone_body => $new_zone_body }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_zone_body => $new_zone_body }});
 		
 		# This is another fail safe, don't edit unless we have a new file body.
 		if (not $new_zone_body)
@@ -231,18 +242,18 @@ sub check_initial_setup
 		# If there isn't a body, see if the file exists. If it doesn't, create it. If it does, read it.
 		my $update_file   = 0;
 		my $old_zone_body = exists $anvil->data->{firewall}{zone}{$zone}{body} ? $anvil->data->{firewall}{zone}{$zone}{body} : "";
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { old_zone_body => $old_zone_body }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { old_zone_body => $old_zone_body }});
 		if (-e $file)
 		{
 			# Has it changed?
 			my $diff = diff \$old_zone_body, \$new_zone_body, { STYLE => 'Unified' };
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { diff => $diff }});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { diff => $diff }});
 			if ($diff)
 			{
 				# Update it
 				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "message_0136", variables => { zone => $zone, file => $file }});
 				$update_file = 1;
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { update_file => $update_file }});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { update_file => $update_file }});
 			}
 		}
 		else
@@ -250,10 +261,10 @@ sub check_initial_setup
 			# Create it
 			$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "message_0137", variables => { zone => $zone, file => $file }});
 			$update_file = 1;
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { update_file => $update_file }});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { update_file => $update_file }});
 		}
 		
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { update_file => $update_file }});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { update_file => $update_file }});
 		if ($update_file)
 		{
 			my $error = $anvil->Storage->write_file({
@@ -264,7 +275,7 @@ sub check_initial_setup
 				mode      => "0644",
 				overwrite => 1,
 			});
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { error => $error }});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { error => $error }});
 			
 			if ($error)
 			{
@@ -282,13 +293,13 @@ sub check_initial_setup
 		foreach my $interface (sort {$a cmp $b} keys %{$anvil->data->{firewall}{zone}{$zone}{interface}})
 		{
 			my $in_zone = exists $anvil->data->{firewall}{interface}{$interface}{zone} ? $anvil->data->{firewall}{interface}{$interface}{zone} : "";
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				"s1:interface" => $interface,
 				"s2:in_zone"   => $in_zone, 
 				"s3:zone"      => $zone, 
 			}});
 			
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { in_zone => $in_zone, zone => $zone }});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { in_zone => $in_zone, zone => $zone }});
 			if ((not $in_zone) or ($zone ne $in_zone))
 			{
 				# Add it
@@ -297,14 +308,18 @@ sub check_initial_setup
 					zone      => $zone, 
 				}});
 				
-				my ($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $anvil->data->{path}{exe}{'firewall-cmd'}." --zone=".$zone." --change-interface=".$interface." --permanent"});
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { output => $output, return_code => $return_code }});
+				my $shell_call = $anvil->data->{path}{exe}{'firewall-cmd'}." --zone=".$zone." --change-interface=".$interface." --permanent";
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+				my ($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $shell_call});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { output => $output, return_code => $return_code }});
 				
-				($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $anvil->data->{path}{exe}{'firewall-cmd'}." --zone=".$zone." --change-interface=".$interface});
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { output => $output, return_code => $return_code }});
+				$shell_call = $anvil->data->{path}{exe}{'firewall-cmd'}." --zone=".$zone." --change-interface=".$interface;
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+				($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $shell_call});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { output => $output, return_code => $return_code }});
 				
 				$anvil->data->{firewall}{reload} = 1;
-				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "firewall::reload" => $anvil->data->{firewall}{reload} }});
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "firewall::reload" => $anvil->data->{firewall}{reload} }});
 			}
 			
 			# Delete it so we know this one has been processed.
@@ -313,21 +328,25 @@ sub check_initial_setup
 	}
 	
 	# Do we need to update the default zone?
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 		internet_zone            => $internet_zone,
 		"firewall::default_zone" => $anvil->data->{firewall}{default_zone}, 
 	}});
 	if ($anvil->data->{firewall}{default_zone})
 	{
 		# What's the current default zone?
-		my ($default_zone, $return_code) = $anvil->System->call({debug => 3, shell_call => $anvil->data->{path}{exe}{'firewall-cmd'}." --get-default-zone"});
-		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { default_zone => $default_zone, return_code => $return_code }});
+		my $shell_call = $anvil->data->{path}{exe}{'firewall-cmd'}." --get-default-zone";
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+		my ($default_zone, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { default_zone => $default_zone, return_code => $return_code }});
 		
 		if ($default_zone ne $anvil->data->{firewall}{default_zone})
 		{
 			# Update.
 			$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "message_0141", variables => { zone => $internet_zone }});
-			my ($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $anvil->data->{path}{exe}{'firewall-cmd'}." --set-default-zone=".$anvil->data->{firewall}{default_zone}});
+			my $shell_call = $anvil->data->{path}{exe}{'firewall-cmd'}." --set-default-zone=".$anvil->data->{firewall}{default_zone};
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+			my ($output, $return_code) = $anvil->System->call({debug => 2, shell_call => $shell_call});
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { output => $output, return_code => $return_code }});
 			
 			$anvil->data->{firewall}{reload} = 1;
@@ -337,7 +356,7 @@ sub check_initial_setup
 	
 	# NOTE: We may want to do machine-specific stuff down the road.
 	my $type = $anvil->System->get_host_type();
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { type => $type }});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { type => $type }});
 	
 	return(0);
 }
@@ -347,10 +366,12 @@ sub restart_firewall
 	my ($anvil) = @_;
 	
 	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "message_0139"});
-	my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $anvil->data->{path}{exe}{'firewall-cmd'}." --complete-reload"});
+	my $shell_call = $anvil->data->{path}{exe}{'firewall-cmd'}." --complete-reload";
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+	my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call});
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { output => $output, return_code => $return_code }});
 	
-	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 3, key => "message_0140"});
+	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "message_0140"});
 	$anvil->System->restart_daemon({debug => 3, daemon => "firewalld"});
 	
 	$anvil->data->{firewall}{reload} = 0;
diff --git a/tools/test.pl b/tools/test.pl
index 4a3e69fe..1c606fe8 100755
--- a/tools/test.pl
+++ b/tools/test.pl
@@ -21,13 +21,13 @@ if (($running_directory =~ /^\./) && ($ENV{PWD}))
 $| = 1;
 
 #print "Starting test.\n";
-my $anvil = Anvil::Tools->new({debug => 2});
+my $anvil = Anvil::Tools->new({debug => 3});
 $anvil->Log->secure({set => 1});
 $anvil->Log->level({set => 2});
 
-$anvil->Database->connect({debug => 3, check_if_configured => 1});
+$anvil->Database->connect({debug => 2});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, secure => 0, key => "log_0132"});
+print "DB Connections: [".$anvil->data->{sys}{database}{connections}."]\n";
 
-$anvil->Network->read_nmcli({debug => 2});
-print Dumper $anvil->data->{nmcli}{'local'};
-
+#$anvil->Network->load_interfces({debug => 2});
+#$anvil->System->generate_state_json({debug => 2});